some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	MemoryGameSVG/MemoryGameSVG/memory-game.js