Merge branch 'master' of github.com:haliphax/ascii.js
Merge branch 'master' of github.com:haliphax/ascii.js