forgot to commit diary entries. Also, apparently exclamation marks can't be in bash
Merge branch 'master' of github.com:beriukay/battleship
Merging branches from Nate's detached head issue.

Also, not sure whether git kept my other commit message. I'd like
to get that figured out someday.