update
Merge branch 'master' of https://github.com/aha01/infoVis

Conflicts:
	index.html