"models update - tournament, team relation"
Merge branch 'master' of https://github.com/netguru-training/ChallengeMe

Conflicts:
	app/models/team.rb