Working code again.
Merge branch 'master' of https://github.com/Fireedud/Data_Vis_HackNY2013

Conflicts:
	server.py