how about Ubuntu?
Merge branch 'fontchange' of github.com:team461WBI/website into fontchange

Conflicts:
	app/assets/stylesheets/custom.css