I hate this
Merge branch 'master' of https://github.com/jcoombs3/MobileSDG-Prototype

Conflicts:
	_css/main.css