pull confluct test
Merge branches 'master' and 'master' of https://github.com/oponkichi/test

Conflicts:
	test.txt
added .gitignore