Add an author
Merge remote-tracking branch 'origin/master' into kawayama

Conflicts:
	README.md
Merge branch 'kawayama' of https://github.com/rivayama/our_enpit into rivayama-kawayama

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