this new files
Merge branch 'master' of https://github.com/shunjiro/test

Conflicts:
	objtest.txt