change 1

change 1
Merge branch 'master' of https://github.com/tomggok/WOSS

Conflicts:
	DYiBan.xcodeproj/project.xcworkspace/xcshareddata/DYiBan.xccheckout