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

Conflicts:
	static/media/less/core.less