something
merge
tournament_detail
merge
Merge branch 'master' of github.com:chuck211991/dk_tourney-2013

Conflicts:
	src/dk_tourney/tournament/urls.py