merge
Merge branch 'master' of
https://github.com/SteffenGorenflo/HTWG-Monopoly-Startpage.git

Conflicts:
	webpage/js/script.js