js changes
Merge branch 'master' of https://github.com/Cosmo/up-and-down.git