modiffied plays and goalkeeper
solved some conflicts
Finished version of goalKeeper
Merge branch 'master' of https://github.com/SebaArriagada/Client-IRSSDeluxe-USM

Conflicts:
	point.cpp
	robot.cpp
	robot.h
	team.cpp