no message
Merge branch 'master' of https://github.com/GGJ204-EBUG/EnemyBuildingGame

Conflicts:
	EnemyBuildingGame/Assets/Prefabs/Bomb.prefab
	EnemyBuildingGame/Assets/Scripts/Ammotypescripts/Bomb.cs
	EnemyBuildingGame/Assets/Scripts/Weaponscripts/BombThrow.cs
Bomb
Merge branch 'master' of https://github.com/GGJ204-EBUG/EnemyBuildingGame