fixed model, removed history/matchinglabel
Merge pull request #1 from hwang9/assign4

fixed model, removed history/matchinglabel