Made the project.
Merge branch 'master' of https://github.com/kyle7273/spaceshipgame

Conflicts:
	.gitignore