db fix
Merge branch 'master' of https://github.com/andyaoao/tutor9527

Conflicts:
	public/html/resume_upload.ejs