up js
up js
Merge branch 'master' of https://github.com/ibone/rails