adding more changes
moved stuff
Merge branch 'master' of https://github.com/linkenneth/battleship

Conflicts:
	src/game.c
	src/player.h
	src/utils.c