wip
Merge branch 'master' of github.com:MLKiiwy/mq-player-angular

Conflicts:
	README.md