solveGitignore
Merge branch 'master' of https://github.com/Naytskai/DuoQ

Conflicts:
	.gitignore