Latest code and pictures
Merge remote-tracking branch 'origin/master'

Conflicts:
	game_memory.html