Init project
Merge branch 'master' of https://github.com/stoskov/TriviaGame

Conflicts:
	TriviaGame.v11.suo