Trying to fix commit stuff.
Merge branch 'master' of https://github.com/connorbrinton/JestureJams

Bringing branches back into line.