gitignore updated
Merge branch 'master' of https://github.com/evanroane/battleship

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/evanroane/battleship