Diskollect
Merge branch 'render' of https://github.com/schnubor/vinylr into render

Conflicts:
	index.html