I created a fuse
Merge branch 'master' of https://github.com/dustinyoste/Wispy

Conflicts:
	Assets/Prefabs/Bomb.prefab