Merge branch 'master' of https://github.com/Onygo/js_memory_game

Conflicts:
	js/memory.js
Conflict memory.js