fixed header link
comment redirect fixed
worked on nav js
added js / fixed comments redirect / fixed add resource button
added solr data to gitignore
Merge pull request #10 from katiekatieb/welcomePage

Welcome page
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