sqq
test
Merge branch 'master' of https://github.com/nnttoo/TestGithub

Conflicts:
	.gitignore
test