Code Formatiert
Merge branch 'master' of https://github.com/lukasleitsch/Zauberwuerfel

Conflicts:
	js/script.js