Notebooks diffusion
Merge branch 'master' of https://github.com/tristandewildt/SmartGridDiffusion

Conflicts:
	src/DiffusionModelInterface2.py
	src/notebooks/Diffusion_of_innovations_new.ipynb