gitignore
Merge branch 'master' of https://github.com/dbogatsky/quiz

Conflicts:
	.gitignore