Conflicts: db/schema.rb public/javascripts/application.js public/javascripts/homework.js public/stylesheets/new_user.css