'gemfilse.lock'
Merge branch 'master' of https://github.com/netguru-training/ChallengeMe
Merge branch 'master' of https://github.com/netguru-training/ChallengeMe
'tournament show - add teams to tournament'
Merge branch 'master' of https://github.com/netguru-training/ChallengeMe

Conflicts:
	Gemfile
	app/controllers/tournaments_controller.rb
	app/views/teams/index.html.haml