only one ship of each type
Merge branch 'master' of https://github.com/evanroane/battleship

Conflicts:
	main.js
Merge branch 'master' into targeting

Conflicts:
	main.js