asdrfty
Merge branch 'master' of https://github.com/dmg0600/necroffice

Conflicts:
	Assets/Creatures/OrigenCreatures/Accesorios.meta
	Assets/Scenes/Main.unity
	Assets/Scripts/Hitbox.cs
	Assets/UI/Textures/HUD_final.meta
	Assets/UnityVS/Editor.meta
ASEDRTYGUOP
Merge branch 'master' of https://github.com/dmg0600/necroffice

Conflicts:
	Assets/Creatures/OrigenCreatures/Accesorios.meta