Merge origin/master

Conflicts:
	MemoryGame/src/memorygame/Board.java
	MemoryGame/src/memorygame/Player.java
Merge origin/master