pre-merge save
Merge branch 'master' of github.com:martintb/typy

Conflicts:
	GUI.py