Merge branch 'master' of https://github.com/steven77723/FittsLawTest

Conflicts:
	MFLT.py
fixed conflict