html/css work

mhm
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/formstyle.css