fixing teams
Merge branch 'master' of https://github.com/cranberryofdoom/dida-dashboard

Conflicts:
	db/migrate/20131016224142_create_teams_users.rb