test change
Merge branch 'master' of https://github.com/Zdaxia/Muisc-App

Conflicts:
	music-app-rdio/public/sass/style.scss
resolving merge