Initial commit
Fixed merge conflict in application.js