not sure about this commit
i don't think there are any changes
previous copy should be more up to date than this one
Merge branch 'master' of https://github.com/rbauer1/jBS

Conflicts:
	shipsTest4.txt
	shipsTest5.txt
	src/base/AI4.java