Model bearbeitet, Localsotorage implementiert
Merge remote-tracking branch 'origin/master'

Conflicts:
	test.html
Model bearbeitet, Localsotorage implementiert
Model bearbeitet, Localsotorage implementiert