update diary
Merge branch 'master' of https://github.com/beriukay/battleship
update diary