ryan :/

hi
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/attendees/new.html.erb
	app/views/enrolments/_form.html.erb