Updates to About
Merge branch 'master' of https://github.com/theannielin/theannielin.github.io

Conflicts:
	index.html