temp
Merge remote-tracking branch 'origin/master'

Conflicts:
	components/track-player.html
	index.html
	src/app.js
	src/service.js
	styles.css