branchtest3
Merge branch 'wahaha' of github.com:d-ikeda/testrepo into wahaahlocal

Conflicts:
	README.md