Merge branch 'master' of https://github.com/haag-test/testrepo

Conflicts:
	test.html
cew