ex36 commit from laptop
Merge branch 'master' of https://github.com/sebdoesntknow/py

Conflicts:
	ex36.py