just pushing to update local files
Merge branch 'master' of http://github.com/walsh06/SpaceMystery

Conflicts:
	mainwindow.ui