debug files!
Merge branch 'master' of github.com:Chryus/rails-sample-app