A soldier is someone who takes orders from the aristocracy, and is compensated well. A warrior is someone who fearlessly relies on self, his intuition and causes no harm or loss to his fellow brothers and sisters, or at the very least, strives towards that. He is a peaceful man.
