Added Waivers
Merge branch 'master' of https://github.com/servemoore/pairs

Conflicts:
	app/controllers/work_orders_controller.rb
fixed work orders controller
error