Meera commit #27

Refer to this commit for more details
Merge branch 'master' of https://github.com/pamelawang/Battleship

Conflicts:
	.DS_Store