Merge pull request #2 from effe1/master

141027会社での編集
merge
conflict memo.md. merge
modified memo.md.