updated models, tested some relationships in rake console
.
updated models, tested some relationships in rake console
updated models, tested relationships

Merge branch 'models'