modifying words
updating resume
Merge branch 'master' of github.com:vickiniu/vickiniu.github.io

Conflicts:
	files/vickiniuresume.pdf
	scripts/intro-words.js