Almost debugged
Merge branch 'master' of https://github.com/linkenneth/battleship

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