initial commit
Merge branch 'master' of github.com:marthall/TDT4102
cleaned up