Merge branch 'funtimes' of github.com:on2valhalla/GestureTrainer into recognition
BAD ASS MOTHER FUCKER
another merge with recognition, and one more to go
cancelled orientation