aaabbb
Merge branch 'master' of https://github.com/yoshixmk/standard_subject

Conflicts:
	test.txt