Merge branch 'master' of https://github.com/AdmiralRico/Smooth-Escape
Merge branch 'master' of https://github.com/AdmiralRico/Smooth-Escape
got a working version of a timer
Merge pull request #4 from AdmiralRico/ali_js

Ali js