fixed conflict error
Merge branch 'master' of https://github.com/Ernti/GG.git

Conflicts:
	gg/GGlauncher.py