works with command line o/
Merge branch 'master' of github.com:Lolke/BattleShip