This Bomb Now Works After Devil Paw DESTROYED IT!!!
fixed conflicts
Merge branch 'master' of https://github.com/blaavogn/GameMaster