first try
Merge branch 'master' of https://github.com/jensgro/tdh-murgtal
Merge branch 'master' of https://github.com/jensgro/tdh-murgtal
responsive
Merge branch 'master' of https://github.com/jensgro/tdh-murgtal

Conflicts:
	dev/klickdummy/css/styles.css
responsive
Merge branch 'master' of https://github.com/64kilobit/tdh-murgtal into 64kilobit-master

Conflicts:
	dev/klickdummy/css/styles.css
	dev/klickdummy/index.php
Includes korrigiert
resolved