fixed
fixed

Merge branch 'master' of https://github.com/mojcas/MemoryGame

Conflicts:
	img/animals.jpg
	img/cats.jpg
	img/cats2.jpg
	img/cats3.jpg
	img/cats4.jpg
	img/cats5.jpg