bad app_cont.rb
Merge branch 'master' of https://github.com/sunnyera/singingalong

Conflicts:
	app/controllers/application_controller.rb
Merge branch 'master' of https://github.com/sunnyera/singingalong
cover page 1