Update markup and images
Merge branch 'master' of https://github.com/kaimys/OpenDataHackDay

Conflicts:
	htdocs/index3.html