add assiciations
fix the rest of the routes
we forgot to git rm these unnedeeded migrations
Merge branch 'master' into alexmain

Conflicts:
	db/seeds.rb
various fixes and integration