nav styles enhanced
Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/styles/base-min.css
	dist/styles/img/sprite_base.png
	dist/styles/img/sprite_base2x.png
	dist/styles/img/sprite_icon.png
	dist/three-column.html
	dist/two-column.html
	ucsd-decorator.zip
nav styles enhanced
nav styles enhanced
merging Alex's version