conflict resolution
Merge branch 'job_seeker_resume' of github.com:jack-inx/Getlive into job_seeker_resume