4 slide
Merge branch 'master' of https://github.com/Grapheme/memory

Conflicts:
	index.html