tournament engine app
Merge branch 'master' of github.com:rulosan/tournament_engine

Conflicts:
	.gitignore