pulled MK's changes to the models and controller
made some changes to merge, need to repull
accepting Tasha's changes
having trouble with db
some changes on seed, trying to get the db working.
merging changes
finally adjusted the seed document to get db off the ground