AI stuff
more
a
Merge branch 'master' of https://github.com/clanier9/stargunner.git

Conflicts:
	stargunner/src/games/caravan/CaravanGame.java
Merge branch 'master' of https://github.com/clanier9/stargunner.git

Conflicts:
	stargunner/src/games/caravan/CaravanGame.java