rails new project
Merge branch 'master' of https://github.com/Ozzie3000/twittermini