update
Merge branch 'master' of
https://github.com/koenigsberc/shiny-octo-lana.git

Conflicts:
	Memory/src/de/htwg/memory/Application.java
	Memory/src/de/htwg/memory/controller/Board.java
	Memory/src/de/htwg/memory/controller/Game.java
	Memory/src/de/htwg/memory/model/Panel.java
	Memory/src/de/htwg/memory/model/Player.java
	Memory/src/de/htwg/memory/view/GUI.java
	Memory/src/de/htwg/memory/view/TUI.java
	Memory/test/de/htwg/memory/BoardTest.java
	Memory/test/de/htwg/memory/PlayerTest.java