fixing marvins deletion rage
Merge branch 'master' of https://github.com/Marvin182/NFC-Datenformate

Conflicts:
	css/custom.css
	parts/thomas.html