Removed some stuff to make the exercises more challenging.
Merge branch 'master' of https://github.com/kvanrobbroeck/acaddemict-managed into jonathan
Pull from master test