Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git into sprint2-network
Merge remote-tracking branch 'origin/gui-sprint2' into sprint2-network
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git into sprint2-network
Merge remote-tracking branch 'origin/gui-sprint2' into sprint2-network
Merge remote-tracking branch 'origin/gui-sprint2' into sprint2-network
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git into sprint2-network
merge and self play
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git into sprint2-network
Added collision check to moveShip() methods
Merge remote-tracking branch 'origin/gamelogic-sprint3' into gui-sprint3
Bugfix for collision detection
Merge remote-tracking branch 'origin/gamelogic-sprint3' into gui-sprint3
merge
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git into sprint2-network
Another bugfix for collision detection
Merge remote-tracking branch 'origin/gamelogic-sprint3' into gui-sprint3
Fixed some issues related with the merge
Fixed transitions for arbitrary board sizes and removed some debug messages
Implemented nicest error message ever! Also improved collision detection
Merge remote-tracking branch 'origin/gamelogic-sprint3' into gui-sprint3