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 remote-tracking branch 'origin/master'

Conflicts:
	dist/styles/base-min.css
	ucsd-decorator.zip
added a new class toggle
added a new class toggle