Merge branch 'master' of https://github.com/AlloSphere-Research-Group/AlloSystem
Merge branch 'master' of https://github.com/mantaraya36/AlloSystem
allovsr update
Merge branch 'master' of https://github.com/AlloSphere-Research-Group/AlloSystem
Merge branch 'master' of https://github.com/mantaraya36/AlloSystem
Build now working on OSX for Makefiles. Xcode still needs a bit of work