app/assets/javascripts/application.js
Merge branch 'master' of https://github.com/haotianwang/CanvUs