Merge branch 'master' into meera_branch
Merge branch 'meera_branch'
Manual merge of pull request #46
Merge branch 'master' of https://github.com/pamelawang/Battleship