Refactoring of bomb by putting logic in own class
Merge branch 'refactoringOfBomb' into develop