commit test

test
Merge branch 'master' of https://github.com/Hwa-young/Ball-Bowl

Conflicts:
	.gitignore
	BBCamera/BBCamera.xcodeproj/project.pbxproj