my changes

1
my changes 2

2
Merge remote-tracking branch 'origin/ryan3'

Conflicts:
	app/views/attendees/index.html.erb
	app/views/camps/show.html.erb
	app/views/enrolments/new_params.html.erb