1906
Merge branch 'master' of https://github.com/NinjaPT/Bomberman

Conflicts:
	Bomberman.iws
	src/presentation/control/Enemy.java