umm
Merge branch 'master' of https://github.com/jcoombs3/MobileCOE-Website

Conflicts:
	_css/main.css
	_js/setup.js