update

update
update2

update2
Merge branch 'master' of https://github.com/Hwa-young/BallnBowl

Conflicts:
	BBCamera/BBCamera.xcodeproj/project.pbxproj
	BBCamera/BBCamera/Classes/BBNavigationController.m