merging jason's models
Merge branch 'master' of github.com:maneeshnycda/microblogger

Merged Jason's models.
things are working