My Memory Page updates

Signed-off-by: jenthomson <jen@upcloseandpixelated.com>
Merge branch 'master' of https://github.com/urfolomeus/edinburgh_stories

Signed-off-by: jenthomson <jen@upcloseandpixelated.com>

Conflicts:
	app/.DS_Store