Merging!
Merge branch 'master' of https://github.com/lizbot/Trivia-Game

Conflicts:
	TriviaGame/UI/Pages/CustomOptionsPage.xaml.cs