README.md edited
Merge branch 'uchida_branch'
Merge branch 'master' of github.com:ucchi/ucchi_enpit01

Conflicts:
	README.md