Merge branch 'master' of https://github.com/arthur9172/tdh-murgtal into arthur9172-master

Conflicts:
	dev/klickdummy/css/styles.css
Merge branch 'arthur9172-master'

Conflicts:
	dev/klickdummy/css/styles.css
Merge branch 'master' of github.com:jensgro/tdh-murgtal