Good html
Merge branch 'master' of github.com:JeroenVdb/Centralized-Git-playground

Conflicts:
	index.html