Create mailing feature
Merge branch 'master' of https://github.com/bsogata/course_availability

Conflicts:
	Gemfile
Error again