1st test
Merge branch 'gh-pages' of https://github.com/SAIC/TheArtOfDataVisualization into gh-pages

Conflicts:
	people/.DS_Store