mobile version
Merge branch 'master' of https://github.com/mgballard/CSOL-site

Conflicts:
	static/media/less/core.less
padding fix, grid overrides :'( - must have a convo about whether fixed/fluid, bootstrap/less, etc.
Merge remote-tracking branch 'ballard/master'