.js in bearbeitung
Merge branch 'dev' of https://github.com/Mischazz/DorfKinderTiere into dev

Conflicts:
	css/style.css
	js/script.js
Merge branch 'dev' of https://github.com/Mischazz/DorfKinderTiere into dev