Removing main.js
Merge branch 'dev'