commit app rails 4
Merge branch 'master' of https://github.com/Cylix/rails_test