more stuff!
Merge branch 'master' of https://github.com/SimonLanghoff/SMDP-GROUP19