Correcting errors from the merge
Merge branch 'master' of github.com:ryanaklein/InsuranceSite

Conflicts:
	application/controllers/insurance_controller.php
	application/views/insurance.php