-some test komit
Merge remote-tracking branch 'origin/master'

Conflicts:
	DryRun/src/dryrun/game/common/Player.java
	DryRun/src/dryrun/game/mechanics/Game.java
Merge branch 'master' of https://github.com/gameDevPrep/DryRun.git

Conflicts:
	DryRun/src/dryrun/game/mechanics/Game.java