typo
Merge branch 'master' of https://github.com/annecylee/portfolio

Conflicts:
	_posts/2014-07-13-Digital_Avatar.markdown