Changing migrations
user migration
Merge branch 'ng-models' of https://github.com/strivedi183/hackfit-hackathon-13 into ng-models
saved and ran migrations
added annotate
Merge branch 'ng-models' of github.com:strivedi183/hackfit-hackathon-13 into ng-models
Added associations with database join migration
starting angular, unstable commit
Merge branch 'ng-models' of https://github.com/strivedi183/hackfit-hackathon-13 into ng-models
Refactoring models
Changed some models
fixed merge conflicts