Notebook new
Merge branch 'master' of https://github.com/tristandewildt/SmartGridDiffusion

Conflicts:

	src/notebooks/.ipynb_checkpoints/Diffusion_of_innovations_3-checkpoint.ipynb
	src/notebooks/Diffusion_of_innovations_3.ipynb