Merge branch 'master' into gh-pages
Work on 404 and 500
Update slider nav, especially for mobile
Merge branch 'gh-pages' of https://github.com/byuweb/byu-responsive-dev into gh-pages
Update 404 and 500
Update 404
Bolder font
Merge branch 'gh-pages' of https://github.com/byuweb/byu-responsive-dev into gh-pages

Conflicts:
	src/sass/shared/_variables.scss
Update variables to include serif-ssm-font-stack
Update header logo
Try out .sc class
Update header logo width
Update footer
Update background image
Update Twitter Bootstrap link
Change media queries to em

Allows for page resizing without breaking the media queries
Change browns to gray
Remove unneeded media query, update footer style
Use variables for colors
Change media queriy to em