change application.rb
Merge branch 'master' of https://github.com/dogless/sa-project