Changes notebook
Merge branch 'master' of https://github.com/tristandewildt/SmartGridDiffusion

Conflicts:
	src/SimplePlot.py