Fixed Encounters not working.
Fixed bug which prevented NPCs from spawning with equipment.
Combat changes compile. Needs to be hooked up, into the game.
Templates set up for random events in data/readers
Random Events are now occurring...all the time...with no text on the screen.
Merge branch 'master' into jack/dev
nbproject properties
Random Events now work and you can make them give or take money from the player. They are integrated with Traders only, since they're the only ones that do anything.
Merge branch 'master' into jack/dev
Merge branch 'master' into sam/dev

Conflicts:
	src/main/java/edu/gatech/gem5/game/Encounter.java
	src/main/java/edu/gatech/gem5/game/Ship.java
	src/main/java/edu/gatech/gem5/game/controllers/DisplaySystemController.java
Cleaned up how Encounters with NPCs are handled.
Cleaned up how Encounters with NPCs are handled.
Cleaned up old comments
Removed unused method in Trader.