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

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

Conflicts:
	index.html
attempting to merge master
Merge branch 'master' of https://github.com/evanroane/battleship

Conflicts:
	index.html
	main.js