meser
Merge branch 'master' of https://github.com/zzlmilk/ResumeApps

Conflicts:
	ResumeManage/ResumeManage.xcodeproj/project.pbxproj
dsd Please enter the commit message for your changes. Lines starting