updates
Merge branch 'master' of https://github.com/nathanrp/CGW

Conflicts:
	franchisee/caregiver.html