Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git into gamelogic-sprint2
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship into gamelogic-sprint2
Game can be won!
Merge remote-tracking branch 'origin/gamelogic-sprint2' into gui-sprint2
Game does quit more or less properly now (or at least reliably)
Fixed handling of status GAME_WON, so the winner actually wins instead of losing
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git into sprint2-network
merge