reverted a commit
Merge branch 'master' of https://github.com/simonracz/Artemis-Cpp