quickfix 1.0 linus
Merge branch 'master' of github.com:lj222kj/ProjektskelettHT13

Conflicts:
	css/style.css
Updat real