Updated db/schema.rb
Rolledback database
Merge branch 'master' of github.com:brandoshmando/final-project into evalroutes
Added routes for Evals Categories and Comments
Added categories and evals controllers
Literally the kitchen sink
Categories are saving from evals but comments are still throwing unpermitted parameters error
Eval nested form works now, comments and categories both save
Evals edit page now working
Added SimpleForm gem, attempting to dynamically add forms to nested model view
Removed SimpleForm
Merge branch 'evalroutes'

Conflicts:
	Gemfile
	config/application.rb
	config/routes.rb
	db/schema.rb