seperated asteroids from main code
fixed merge conflicts
fixed merge conflicts
Merge branch 'master' of https://github.com/Adalden/asteroids2