bug enlever!
yolo
Merge remote-tracking branch 'origin/master'

Conflicts:
	battleship.v12.suo
	battleship/Form1.cs