associations, models and migrations done.
fixed merge conflicts'
Merge pull request #3 from dyoachim/associations_and_setup

Associations and setup