Change in models, associations and validations
Merge pull request #6 from mrchacon/mrchacon-wip

Change in models, associations and validations