before pull
Merge branch 'master' of https://github.com/Ethanmn/BattleShip474

Conflicts:
	Battle Ship 474/Battle Ship 474.suo
	Battle Ship 474/Battle Ship 474/Battle Ship 474/Game1.cs
	Battle Ship 474/Battle Ship 474/Battle Ship 474/Ship.cs
Merge branch 'master' of https://github.com/Ethanmn/BattleShip474

Conflicts:
	Battle Ship 474/Battle Ship 474.suo
	Battle Ship 474/Battle Ship 474/Battle Ship 474/Battle Ship 474.csproj
	Battle Ship 474/Battle Ship 474/Battle Ship 474/Game1.cs