update
Merge branch 'master' of github.com:tonytan748/tonytan748.github.io

Conflicts:
	resume/index.html