PlayerObjet
Merge branch 'master' of https://github.com/flanr/GPIBase

Conflicts:
	Fishy/Core.cpp