tweaks
Merge branch 'master' of https://github.com/BYUI-Web/responsive-prototype

Conflicts:
	_includes/header.html
	_less/bootstrap/variables.less