rename
Merge branch 'master' of https://github.com/wasipo/linuxmemo

Conflicts:
	readme.md