commit
Merge branch 'master' of https://github.com/g79664/Cam-Tastic

Conflicts:

Cam-Tastic.xcodeproj/project.xcworkspace/xcuserdata/Tyler.xcuserdatad/Us
erInterfaceState.xcuserstate