Adding g to platform
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Platform.py
	test/CodeTest.py