Local
Merge branch 'master' of https://github.com/stoskov/test5.git

Conflicts:
	test05/index.html