modified main.cpp
modified main.cpp
Merge branch 'Str_Transplant' of https://github.com/trunone/GPPlatformMain into Str_Transplant

Conflicts:
	Framework/src/strategy/modules/Stra_FindBall.cpp