Add schema.rb
Fix merge conflict
Fixed issue with assets not compiling in heroku
Merge branch 'master' of https://github.com/Flamdoodle/before-move