Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/zzlmilk/ResumeApps

Conflicts:
	ResumeManage/ResumeManage/Base.lproj/Main.storyboard
	ResumeManage/ResumeManage/Classes/ResumeColor.h