project take over the world phase 1
Merge branch 'master' of https://github.com/tbenedict/Rails-Girls