re-commented something
Merge branch 'master' of github.com:project-camelback/camelback-rails