added in the foreign key index to the migrations
solved merge conflict
fixed merge conflicts
fixed merge conflicts
fixed merge conflict issues
updated schema
pulled from github
merge conflicts resolved
fixed migrations
writing tests for models
passing all tests
Merge pull request #11 from abigezunt/fixmodel

Fixes models and passes all tests, all extraneous code commented out
Cleaning up comments Abby was using for reference.
Cleaning up comments Abby was using for reference.
Cleaning up comments Abby was using for reference.
Cleaning up comments Abby was using for reference.
Cleaning up comments Abby was using for reference.