GUI
Merge branch 'master' of https://github.com/M4urice/uberthesaurus

Conflicts:
	guithesaurus.py
	test2.py
	test3.py