Testing to master

This is for v1.02 of TriviaTime.