mmmm, dat camera stuff tho
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing