Initial commit
Updating branch
Attempting to fix conflicts.
Attempting to merge new assets.
Merge branch 'assets-restructuring'

Conflicts:
	assets/css/screen.css
	assets/sass/_colors.scss
	assets/sass/_secondary.scss
	assets/sass/_type.scss
	assets/sass/compass_app_log.txt
	assets/sass/config.rb
	assets/sass/screen.scss
	includes/shared/nav.php
More merge updates.
Merge branch 'master' of https://github.com/vculibraries/redesign