Delete old CSS files, add Eric Meyer reset
Merge branch 'css' of github.com:katiekatieb/codeunion into css
testing css branch
Merge branch 'css' of https://github.com/katiekatieb/codeunion into css
Adding Box Sizing to CSS reset
adds base colors, edits voting function
Merge branch 'css' of github.com:katiekatieb/codeunion into css
Initial header and typography styles
Merge branch 'css' of https://github.com/katiekatieb/codeunion into css

Conflicts:
	app/assets/stylesheets/base/colors.css.scss
color alterations
Merge branch 'css' of https://github.com/katiekatieb/codeunion into css
Adding font files and links, more formatting on header
Continued Article styles, typography, starting Nav CSS
Adding slider Nav bar
Merge branch 'master' of https://github.com/katiekatieb/codeunion into css

Conflicts:
	app/views/layouts/_header.html.erb
	app/views/layouts/_sliderNav.html.erb
	app/views/layouts/application.html.erb
	app/views/resources/show.html.erb
	solr/development/data/index/segments.gen
Fine-tuning nav bar format, search, fonts
Merge pull request #11 from katiekatieb/css

Css