Refactor
Merge branch 'master' of http://github.com/Qlio/TypingRace

Conflicts:
	Trick.py