markup on cv continued
fixed merge on CV

Merge branch 'master' of https://github.com/jhollist/jhollist.github.io

Conflicts:
	newsite/cv.html