gem
merged gem.l
Merge branch 'master' of https://github.com/sunnyera/singingalong

Conflicts:
	Gemfile.lock
	app/views/admin/courses/_form.html.erb