change FPS to TPS
Merge remote-tracking branch 'origin/na3alf6_testing' into
chihiro_testing

Conflicts:
	source/draw.cpp
	testprogram
fix marge bug