Merge branch 'modeling-users' of https://github.com/coulondre/twitter_style_app
Merge branch 'master' of https://github.com/coulondre/twitter_style_app