Updated
Updated GUI.py
Merge branch 'master' of github.com:Aweeeezy/Simulator

Conflicts:
	GUI.py
Testing GUI.py