Final version (?)
Merge branch 'master' of https://www.github.com/svenvanhal/Assignment3