remove /javascripts/application.js.orig.js
Merge branch 'master' of https://github.com/maxcobmara/ogma