Merge branch 'master' of github.com:focused/rails4_app
Merge branch 'master' of github.com:focused/rails4_app