Added placing ships
Merge branch 'master' of https://github.com/MarkAZhang/6824battleship

Conflicts:
	js/ship.js