auto-commit via MAKE
Merge branch 'master' of github.com:linkenneth/battleship