Its still not working
Merge branch 'master' of https://github.com/fireDude90/Space-Game

Conflicts:
	SFML Space Game/Game.cs
	SFML Space Game/Ship.cs
	SFML Space Game/res/ship/Ship uno.xml
	SFML Space Game/res/ship/ShipOne.xml
	SFML Space Game/res/ship/test.xml