modifications
mergeing and fixing db
Merge pull request #134 from alaashafaee/dev_models

Dev models