Cleaning up.
Merge branch 'master' of https://github.com/darcyclarke/Space-Apps