Deleted all js on main.js master branch
Added comment on main.js
Merge branch 'master' into extra-styling-and-content

* master:
  Added comment on main.js
  Deleted all js on main.js master branch

Conflicts:
	main.js

Need to remove main.js.orig