fix this shiiiiii
Merge branch 'master' of github.com:turtl/js