Merge pull request #1 from sidpatel13/hilary

Models and Migrations
tables done
simplified models and associations
small change
seed file made
user signup stuff done, starting work on feedback forms
feedback form created
user can create new category
created seeds to add teachers to the database
added view logic for public vs. private feedback
added matt in seed file
added staff to cohorts
Merge pull request #4 from sidpatel13/seed_teachers

Seed teachers
Added post '/displayfeedback' and application.js
merged changes
merge conf
application.js