Not a good remover
Merge remote-tracking branch 'gui/master'

Conflicts:
	UI.py