week 7
fixed merge conflicts
working on Asteroids