kevins models not tested yet, finished routes.rb
merged