Html og css mostly...
Merge pull request #1 from andersdn11/17/12-23.48

Html og css mostly...
Conflict Fixed