Enabled CORS in application.rb
reorganized home.js
fixed merge conflict
fixed merge inconsistency