Leif
Merge branch 'cfp' of github.com:Espenhh/jz13 into cfp

* 'cfp' of github.com:Espenhh/jz13:
  Cleanup.
  Skalering.