.
Merge branch 'master' of https://github.com/VJan-fin/Trivia_master