aaa
Merge branch 'master' of https://github.com/sara89sgm/MoodMusic

Conflicts:
	MoodMusicCloud/cloud/main.js