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

Conflicts:
	SocialComic2014.xcodeproj/project.pbxproj

SocialComic2014.xcodeproj/project.xcworkspace/xcshareddata/SocialComic20
14.xccheckout
Merge branch 'master' of https://github.com/CraigZheng/SocialComic2014