ops! habs vergessen
Merge branch 'master' of https://github.com/zetabeta/gamejam

Conflicts:
	core/src/main/java/com/gamejam/core/Board.java