new styling
Conflicts:
	uebung-1/src/main/webapp/style.css
fixed merge