added models and associations
tweaked models and associations and rating migration
tweaked models, assoctiations, migrations
merge conflict resolution
Merge pull request #6 from jpark3000/migrations

Migrations