Merge pull request #24 from garethleonard/master

Asteroid difficulty progression fixed
GUI updates
Merge branch 'master' of https://github.com/klords/ser-215-asteroids