Merging conflicts
Merge branch 'master' of https://github.com/flymperopoulos/ShooterPlatform
Fixed merges
Solving merges
Added bomb option