js editing
Merge branch 'master' of https://github.com/jbunting/pinch-app