Merge branch 'master' of https://github.com/RealMasterDuke/customRepairs

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/views/pages/home.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'master' of https://github.com/RealMasterDuke/customRepairs

Conflicts:
	.idea/workspace.xml