Fixed test system so does not clash with project
Merge branch 'master' of https://github.com/btparker/3dScan