我的简历页面
Merge branch 'master' of https://github.com/Andy-Yin/iOS51rcProject

Conflicts:
	iOS51rcProject.xcodeproj/project.pbxproj