Initial Commit
Merge branch 'master' of https://github.com/willrice94/Trivia

Conflicts:
	.gitignore