conflict part 1
Changed the readme link
Resolved README conflict
Merge pull request #14 from rhiever/master

Changed the readme link
Added all our planets work to the repo.
Merge branch 'master' of https://github.com/guyrt/laughing-octo-avenger
Merge branch 'master' of https://github.com/guyrt/laughing-octo-avenger