gitignore
Merge branch 'master' of https://github.com/M0rph3v5/sqrolls
hjgjh
Merge branch 'master' of https://github.com/M0rph3v5/sqrolls

Conflicts:
	.gitignore