test mheckel
Merge branch 'master' of https://github.com/hydra-newmedia/tests

Conflicts:
	index.html