Merger
Merge branch 'develop' of https://github.com/richelbilderbeek/ProjectRichelBilderbeek into develop
Trivial merge
Changes to allow Coen to compile
Merge pull request #156 from coen-d/develop

Getting Coen to compile