change message
Merge branch 'my_branch' of https://github.com/kkpb/our_enpit into kkpb-my_branch

Conflicts:
	README.md
Merge branch 'kkpb-my_branch'
Merge branch 'master' of github.com:ychubachi/our_enpit