try to fix gitignore
Merge branch 'master' of github.com:focused/rails4_app