added PlayerTemp so it would run
Merge origin/master

Conflicts:
	Memory/src/memory/Game.java