samy merge
Merge branch 'newGameDesign' of https://github.com/BenjaminBrossi/SEPS13-Gruppe5 into newGameDesign

Conflicts:
	src/ch/zhaw/mcag/Board.java