Fixed tabbing issue
Merge branch 'master' of github.com:knutesten/tdt4900