Added some comments. Borked some stuff I think.
Merge branch 'master' of https://github.com/simonra/IT3105.git
asdfasdfasdfasdf