Merge branch 'myTest' and test commit --amend

Conflicts:
	README.md
Merge branch 'master' of github.com:scarletsky/sakuramai