rake task update_items added
Merge branch 'master' of https://github.com/joshricha/project_2
Merge branch 'master' of https://github.com/joshricha/project_2
class associations added
Merge branch 'master' of https://github.com/joshricha/project_2
edited out double ups of associations in classes