Added song handling in Controller
Merge branch 'master' of https://github.com/cupofjoakim/Molgan

Conflicts:
	app/index.html