added in the foreign key index to the migrations
merged conflicts
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