GUI update is working fine! Needs further improvement!
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
GUI update is working fine! Needs further improvement!