Fixing head so I can pull changes
missed adding a file
Merge branch 'master' of https://github.com/kylebechtel/BattleshipGame

Conflicts:
	Game/.idea/workspace.xml