Nastrel por vyplnovani dochazky.
Merge branch 'master' of https://github.com/trptom/TableSoccer_Rails

Conflicts:
	config/routes.rb