Nothing.
Merge branch 'master' of https://github.com/jklt/videolyrics-client

Conflicts:
	dist/index.html
	dist/js/vendor.min.js
	dist/js/vendor.min.js.map
	src/index.html
Merge branch 'master' of https://github.com/jklt/videolyrics-client
Merge branch 'master' of https://github.com/jklt/videolyrics-client
Todo.