Changes.
Merge branch 'master' of https://github.com/kulak-at/DicePlusHackaton

Conflicts:
	src/eu/rotato/diceplushackaton/GameListener.java