changes at comparison
Merge branch 'master' of https://github.com/malt3/Fallpauschale

Conflicts:
	web/css/main.css