Latex Aufgabe 2 TGAI
Merge branch 'master' of https://github.com/FrauChu/Softwaretechnik-Projekt into HEAD

Conflicts:
	Memory/.classpath
	Memory/.gitignore
	Memory/.settings/org.eclipse.jdt.core.prefs
	Memory/pom.xml
	Memory/src/de/htwg/memory/entities/Board.java
	Memory/src/de/htwg/memory/entities/MemoryCard.java
	Memory/src/de/htwg/memory/logic/BoardEventAdapter.java
	Memory/src/de/htwg/memory/logic/SettingUtil.java
	Memory/src/de/htwg/memory/logic/Util.java
	Memory/src/de/htwg/memory/ui/TUI.java
	Memory/src/de/htwg/memory/ui/VirtualConsole.java
	Memory/test/de/htwg/memory/entities/BoardTest.java
	Memory/test/de/htwg/memory/entities/MemoryCardTest.java