Some work on GUI
Merging..
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	deleted:    Assets/fx_explosion.fbm/fx_explosion.png
 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	Assets/fx_explosion.fbm.meta
	Assets/fx_explosion.fbm/
Merge branch 'ammo'

Conflicts:
	Assets/scenes/devmap.unity