update
Merge branch 'master' of https://github.com/Littlebox222/ManChallenge

Conflicts:
	ManChallenge.xcodeproj/project.pbxproj
	ManChallenge/THCapture.m