Edited after bad merge with incredible git!
Merge branch 'master' of https://github.com/ttitto/Memory-Matrix-JS-Game

Conflicts:
	MemoryMatrixGame/MemoryMatrix/css/styles.css