Merge origin/master

Conflicts:
	src/memorygame/Game.java
Merge origin/master

Conflicts:
	src/memorygame/Game.java