Update memo.txt
Merge branch 'develop'