moar styling
Merge branch 'master' of github.com:calblueprint/odalc-billboard

Conflicts:
	odalc_billboard/templates/index.html