week9
Merge branch 'master' of https://github.com/GrayAreaorg/Summer-Immersive-2014

Conflicts:
	class_materials/wk7 - Data Visualization/sample-project/scatter.html