added tdt4242
Merge branch 'master' of github.com:vikre/NTNU