thumbs.db...
Merge remote-tracking branch 'upstream/master'
da geht was
2 widgets
Widget 3
css change
Merge remote-tracking branch 'upstream/master'
struktur der widgets verbessert
link hover und farbe eingestellt
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:jensgro/tdh-murgtal

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