Merge remote-tracking branch 'Lukas/master'

Conflicts:
	htwg.se.risky/src/model/Player.java
Player und testPlayer Klasse implementiert und getestet. 100% Coverage
PlayerTest und Player 100% Coverage