fixed bug
Merge branch 'master' of github.com:magnhalv/TDT4255