m&m 1.0
validate models and migrations
remove comments
fix merge conflicts?
fix merge conflicts in user model
Merge pull request #2 from alexung/migrations_and_models

Migrations and models