Merge branch 'master' of https://github.com/syou6162/diary

Conflicts:
	README.md