Merge pull request #28 from icambron/master

Unconfuse my branches
typo
Merge branch 'develop' of github.com:icambron/twix.js into develop
updating js files