no idea why this commit
Merge branch 'master' of https://github.com/mlowitz/battleshots

Conflicts:
	src/boardserver.c