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

Conflicts:
	app/views/layout/base.blade.php