added naive ai, gamestates
Delete hs_err_pid7476.log
merge conflicts
merged correctly this time
merging with detached head
deleted some merge stuff
Delete Battleship.java.orig