lp lokal
Merge branch 'master' of https://github.com/Tavark/HTWG.git

Conflicts:
	Ludo/src/de/htwg/ludo/model/gameboard/Gameboard.scala