created state scaffold
resolved conflicts
create congresspeople class
added model relationships
ran migration
Merge pull request #25 from abcm1989/master

changed migrations and models for new view