fghfg
Merge branch 'master' of https://github.com/qualab/moody

Conflicts:
	songs/templates/mood.html
dfsdf
Merge branch 'master' of https://github.com/qualab/moody
sdf