Removed RJCB stuff he has to fix first
Merge pull request #154 from yurtman/develop

Removed RJCB stuff he has to fix first
Merger
Merge branch 'develop' of https://github.com/richelbilderbeek/ProjectRichelBilderbeek into develop
Trivial merge
Changes to allow Coen to compile