Merge branch 'master' of https://github.com/iwasaky/memo
line added
Merge branch 't131205'
modified
Merge branch 'master' of github.com:iwasaky/memo

Conflicts:
	README.md