Finished shape and color menus
Merge branch 'master' of https://github.com/vancegroup/LowCostVRDemo