was tinkering with Dummy Camera
Deleted merge conflicts
Giving Alvin the Camera Test Code
Merge branch 'master' of https://github.com/AlvinYuan/cs160