Working on xml loading
Merge branch 'master' of https://github.com/spfrommer/space-raiders

Conflicts:
	src/java/game/SpaceShipGame.java