Merge branch 'funtimes' into recognition
WTF.
Merge branch 'recognition' of github.com:on2valhalla/GestureTrainer into recognition