Merge https://github.com/CodeExecutioners/Goggin

Conflicts:
	main.pyc