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

Conflicts:
	TriviaGame/Infrastructure/Initialization/DatabaseInitialization.cs