fuck this fucking shitfuck
Merge remote-tracking branch 'origin/whatamidoing' into cranknicholson

Conflicts:
	ex4.py
mistakes