changed gemfile, added assosciations, created controllers