Update
Merge branch 'master' of https://github.com/longvinhnguyen/iOS-Programming

Conflicts:
	TestScrollViewPhoto/TestScrollViewPhoto.xcodeproj/project.pbxproj

TestScrollViewPhoto/TestScrollViewPhoto.xcworkspace/xcuserdata/visikardm
acbookpro.xcuserdatad/UserInterfaceState.xcuserstate

TestScrollViewPhoto/TestScrollViewPhoto.xcworkspace/xcuserdata/visikardm
acbookpro.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
	TestScrollViewPhoto/TestScrollViewPhoto/SelectPlayerViewController.m