dsf
Merge branch 'master' of https://github.com/knepe/megamemory

Conflicts:
	project/.idea/workspace.xml
	project/out/production/MegaMemory/MegaMemory.apk.res