added to CV and about me
Merge branch 'source' of https://github.com/erma928/erma928.github.io into source

Conflicts:
	source/about/index.markdown