comment
comment
Merge branch 'master' of https://github.com/liuzhihuinb/ADImageViewDemo

Conflicts:
	.DS_Store
	ADImageViewDemo.xcodeproj/project.xcworkspace/xcuserdata/liuzhihui.xcuserdatad/UserInterfaceState.xcuserstate
	ADImageViewDemo.xcodeproj/xcuserdata/liuzhihui.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	ADImageViewDemo/.DS_Store
	ADImageViewDemo/._ViewController.m
	ADImageViewDemo/ADImageView/._ADImageView.m
	ADImageViewDemo/ADImageView/._ADImageViewController.m
	ADImageViewDemo/ADImageView/ADImageView.m
	ADImageViewDemo/ADImageView/ADImageViewController.m
	ADImageViewDemo/Data Center/DataCenter.h
	ADImageViewDemo/Data Center/DataCenter.m
	ADImageViewDemo/ViewController.m