added resume
merge details
Merge branch 'master' of github.com:ncnuech/Website

Conflicts:
	README.md