Signed-off-by: tore <tore.mueller@googlemail.com>
Merge branch 'master' of https://github.com/Ernti/GGcpp

Conflicts:
	GG.cbp