Merge branch 'master' of https://github.com/shabot/memories
sources from web
Merge branch 'master' of https://github.com/shabot/memories