Sdf
Merge branch 'master' of https://github.com/AFd3z/wusickapp

Conflicts:
	wusick/app/scripts/controllers/controllers.js