Merge branch 'develop' of github.com:pohlandreas/superTest

Conflicts:
	index.html
Test
Merge branch 'master' of github.com:pohlandreas/superTest

Conflicts:
	index.html