updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	AustriaExample.ipynb
	SIMODEL Test PC.ipynb
	entropy.py
	pySI.py