asd
Merge branch 'master' of https://github.com/AFd3z/wusickapp.git
asad
Merge branch 'master' of https://github.com/AFd3z/wusickapp.git

Conflicts:
	wusick/app/views/index.html