working from home
Merge origin/master
working from home: eliminating bugs
working from home: eliminating bugs
working from home: fixing getRandomQuestion-method
working from home: eliminating bugs + implementing Junit-test