Changes to Dia1.dia giving merge conflicts
Trying to fix merge conflicts
Merging new files from parent
Changed some of the model's code and created test suites to test the functionality of the  models
Pulled from master
Merge pull request #86 from iameric1986/master

Changed the models and created test suites for them