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

Conflicts:
	_posts/2014-01-27-Gillpark.md