change some code
and test --amend command
it will change privous commit message
commit UIBarController Sample.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	UINavigationController/UINavigationController.xcodeproj/project.xcworkspace/xcuserdata/Neil.xcuserdatad/UserInterfaceState.xcuserstate

commit changes