fast player
Merge remote-tracking branch 'origin/master'

Conflicts:
	RiO13-computer-graphic-2e7a6bf2b033/spacePlan/Helper.h