Fixed a typo
Merge branch 'master' of github.com:arrgyle/dotcom

Conflicts:
	source/about/index.markdown
Fixed a typo