Added a ship that can be hit.
Added ship to cell that can be hit
Merge branch 'master' of https://github.com/aptitud/SimpleBattleship

Conflicts:
	client/index.html
Fixed something (maybe a merge conflict)