debut placement des bateaux
Merge branch 'master' of https://github.com/Raptord/NodeBattleship

Conflicts:
	index.html
Merge branch 'master' of https://github.com/Raptord/NodeBattleship