text edit
Merge branch 'master' of https://github.com/shancarter/dataviz-home

Conflicts:
	index.html