个人设置
Merge branch 'master' of https://github.com/SSSSSSnail/Work_For_Fun_20140225

Conflicts:

Work_For_Fun_20140225.xcodeproj/project.xcworkspace/xcshareddata/Work_Fo
r_Fun_20140225.xccheckout
	Work_For_Fun_20140225/Base.lproj/Main.storyboard