super
Merge branch 'master' of https://github.com/vojtatranta/sport_online

Conflicts:
	application/controllers/spectator.php
	application/views/match_index.php
	assets/css/main.css