committing attackphase
Merge branch 'master' of github.com:linkenneth/battleship

Conflicts:
	src/game.c
	src/gameState.h