Modified demo script.

I don't think the plot works yet...
Merge branch 'master' of https://github.com/UCHIC/ODM2

Conflicts:
	src/api/Demo.py