crash test (Mac)

crash test (Mac)
Merge branch 'master' of https://github.com/dinobei/ProjectARTOA

Conflicts:
test2.cpp
Merge branch 'master' of https://github.com/dinobei/ProjectARTOA