js and tut
fixed merge conflicts
Merge branch 'master' of https://github.com/dslysenko/flaming-spice