Merge branch 'master' of https://github.com/Gegendarsteller/Ticketomat

Conflicts:
	style.css
Revert "Merge branch 'master' of https://github.com/Gegendarsteller/Ticketomat"

This reverts commit b4999fcbd93ea3bb76f496cfd9d4f330428c36bd.
Merge branch 'master' of https://github.com/Gegendarsteller/Ticketomat