Merge pull request #1 from j3py/millow_branch

Millow branch
merge commit
Merge branch 'master' of github.com:j3py/Asteroid-Hackathon
map stuff added
almost finished