stuff
Merge remote-tracking branch 'origin/sprint2-network' into gui-sprint2
Merge remote-tracking branch 'origin/sprint2-network' into gamelogic-sprint2
change states
Merge remote-tracking branch 'origin/sprint2-network' into gamelogic-sprint2
Merge remote-tracking branch 'origin/sprint2-network' into gui-sprint2
change states
Merge remote-tracking branch 'origin/sprint2-network' into gui-sprint2
Added simple network test
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship into gamelogic-sprint2
Merge remote-tracking branch 'origin/gui-sprint2' into gamelogic-sprint2