questions stuff
merging
resource view
merging master into resourceview2
fixed merge in seeds
updated some stuff
fixed a couple comment bugs
Merge branch 'master' of https://github.com/Prometheus-uu13/KnowledgeThief
seed file merge
a few updates, trying to pull from master
Merge branch 'master' of https://github.com/Prometheus-uu13/KnowledgeThief

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
fixed merges
fixed a few styling bugs
fixed a few styling bugs, resourceview not yet working
precompiled assets'