more changes
Merge branch 'master' of https://github.com/ttitto/Memory-Matrix-JS-Game

Conflicts:
	MemoryMatrixGame/MemoryMatrix/js/app.js