En rebase!

Testing

Hei og hopp!
Merge branch 'master' of https://github.com/sarcophilus/ndckurs