regular commit
Merge branch 'master' of https://github.com/CraigZheng/CustomArticleBoardReader

Conflicts:

CustomArticleBoardReaderV2.xcodeproj/project.xcworkspace/xcuserdata/crai
g.xcuserdatad/UserInterfaceState.xcuserstate
	CustomArticleBoardReaderV2/Base.lproj/Main.storyboard