Initcommit
Merge branch 'master' of https://github.com/petteas/TDT4240