what am i doing?
Merge remote-tracking branch 'origin/whatamidoing' into cranknicholson

Conflicts:
	ex3.py
plot delta done