Confusing git issues!
Merge branch 'master' of https://github.com/BenVanCitters/processing-library-template