"Changed the views for password reset and sign up form"
"Add rubocop fixed formatting and styling."
Merge branch 'master' of https://github.com/xssoftware/defend-the-order

Conflicts:
	app/controllers/static_pages_controller.rb
	db/schema.rb