aaaaaaaaaaaaaa
Merge branch 'master' of https://github.com/s-ta/memo
Merge branch 'master' of https://github.com/s-ta/memo

Conflicts:
	readme.txt
Merge branch 'topic/lino'

Conflicts:
	readme.txt