追加テスト
Revert "追加"

This reverts commit d57ebca45db2b71f3da4e5d0e0c2ceb92680bff7.
Revert "Revert "追加""

This reverts commit 71d70b3d25e9295f15e56e2d56388ecd300c8741.
Merge remote-tracking branch 'origin/master'

Conflicts:
	hello.txt
Merge branch 'master' of https://github.com/chikoski2014f/lecture11

Conflicts:
	hello.txt