style update
Merge branch 'master' of https://github.com/sverro2/WEBS2

Conflicts:
	css/std.css