Merge branch 'master' of https://github.com/GriffinImer/GriffyJS
Merge branch 'master' of https://github.com/GriffinImer/GriffyJS