Merged CSS and cleaned header.js accordingly.
Merge branch 'master' of https://github.com/skovsgaard/blok

Conflict when pushing