blub
Merge branch 'master' of https://github.com:443/bbcnt/bomberman.git

Conflicts:
	src/troll.java