fiddling
Merge branch 'master_from_home' of
https://github.com/gumdrop/chilternquizleague into master_from_home

Conflicts:
	chilternquizleague/WebContent/competition/league.html
	chilternquizleague/WebContent/css/competition.css