Merge branch 'funtimes' of github.com:on2valhalla/GestureTrainer into recognition
COMMITING ALSO FOR JSON ALSO FOR DROPPIN DIMES ON DEM BITCHES
THIS IS ONE BAD MOTHER FUCKING COMMIT. ROCKED THAT SHIT
merge with recognition, user updates