tekitou
Merge branch 'master' of github.com:kanpe777/gitdojo2

Conflicts:
	README.md