change gitignore
create models and associations
Merge branch 'master' into gemfile