test!
Merge branch 'master' of https://github.com/masashiGMS/practiceRepo3

Conflicts:
	test.txt