Work
Merge branch 'master' of https://github.com/clanier9/stargunner.git

Conflicts:
	stargunner/src/gameEngine/character/BaseCharacter.java
	stargunner/src/games/caravan/CaravanGame.java