nav styles enhanced
Merge pull request #1 from alexhwu/master

CSS and HTML Updates
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
merging Alex's version
nav style edits
nav style edits
Merge branch 'master' of https://github.com/alexhwu/ucsd-decorator

Conflicts:
	app/styles/base.css
	app/styles/partials/ucsd/base/_nav.scss
	ucsd-decorator.zip
Merge branch 'master' of https://github.com/alexhwu/ucsd-decorator

Conflicts:
	app/styles/base.css
	app/styles/partials/ucsd/base/_nav.scss
	ucsd-decorator.zip
Removed dist and zip file from git tracking.
Fix linkds in kitchen sink page.