style and stuff
Merge branch 'master' of github.com:cassieramen/adopt-a-planet