Added more fun stuff
Merge branch 'master' of github.com:dbarella/python-night-2014

Conflicts:
	demo.py