mistake
Merge branch 'collaborators'

Conflicts:
	db/seeds.rb
updated db schema and added redis
cleaned up DB, modified add collaborator view