Ready for demo.
Merge branch 'demo'

Conflicts:
	app/app.py