vilin muutoksia...
Merge branch 'vilin'

Conflicts:
	screen.html
Merge branch 'master' of github.com:varesa/ContestScreen