Merge branch 'gh-pages' of https://github.com/ian-g/asteroid-prospector into gh-pages
Merge branch 'gh-pages' of https://github.com/ian-g/asteroid-prospector
Merge pull request #5 from killfall/gh-pages

update
Merge branch 'master' of https://github.com/ian-g/asteroid-prospector
Added control image
Merge pull request #47 from ian-g/master

Added controls image