filling out project model
Merge remote-tracking branch 'upstream/master' into dev
Merge pull request #6 from apatel/dev

Dev