Cleaned up code.
Added NPC superclass to Pirate, Police, & Traders
commit before merge w/ master.
Merge branch 'master' into sam/dev
Encounters happen when travelling.

Conflicts:
	src/main/java/edu/gatech/gem5/game/Ship.java
Bugfix: Fixed two bugs concerning character creation.