Update .gitignore
Merge branch 'master' of https://github.com/gespenstt/Cubeta-Trivia

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/gespenstt/Cubeta-Trivia