Merge origin/master into Martin

Conflicts:
	Studienprojekt2/src/studienprojekt/Main.java
	Studienprojekt2/src/studienprojekt/Mapper.java
Merge pull request #7 from Kryolith/Sebastian

Sebastian
Merge pull request #8 from Kryolith/Sebastian

Sebastian
Merge pull request #9 from Kryolith/Martin

merge
Merge pull request #10 from Kryolith/master

ghghg