no message
Merge branch 'master' of https://github.com/dmg0600/Necroffice

Conflicts:
	Assets/Scenes/Main.unity
Interfaz
Interfaz
Merge branch 'master' of https://github.com/dmg0600/Necroffice

Conflicts:
	Assets/Dwarf/Scripts.meta
	Assets/UI/Textures/HUD_final.meta
	Assets/UnityVS.meta
	Assets/UnityVS/Editor.meta
metidos las nuevas explosiones
Merge branch 'master' of https://github.com/dmg0600/Necroffice

Conflicts:
	Assets/Dwarf.meta
	Assets/Scenes/Main.unity
Merge branch 'master' of https://github.com/dmg0600/Necroffice

Conflicts:
	Assets/UI/Textures/HUD_final.meta