ship color
Merge branch 'master' of github.com:StefanReindl/battleship into explosion/timelimit
bug fix
timeout function on explosion working
conflict gamehtml
ship styling
Merge branch 'explosion/timelimit'