Refreshed from server
Merge branch 'master' of https://github.com/MSherry24/girlsrock

Conflicts:
	src/classes/CamperApplicationControl.cls
	src/pages/Camper_Application.page