minor bug
tmp
tmp
Committing for Divi
consalidating document.ready calls into main.js
Merge branch 'master' into shaun

Conflicts:
	_css/main.css