adding events
Merge remote-tracking branch 'origin/master'

Conflicts:
	streaming.py
Merge branch 'master' of https://github.com/cpadilla/CodeDayVisualizer2014

Conflicts:
	streaming.py