another commit
Merge branch 'master' of https://github.com/dudds6699/railstwitter

didn't know there where merge conflicts