escaleras....
Merge remote-tracking branch 'origin/master'

Conflicts:

	PlayAwardSrc/Assets/PlayAward/Gfx/FBX/escaleras_nuevas/escaleras_nuevas.FBX.meta
puto git
Merge branch 'master' of https://github.com/exAntares/PlayAward
Seguimos intentando cerrar el hall. El cuento de nunca acabar
Prueba a borrar
Stalker enemy concept. I thought that it was merged before.
Added meta de BookShelve_M
Merge branch 'master' into develop
Asset: Probando Verja circular
Merge remote-tracking branch 'origin/master'

Conflicts:
	PlayAwardSrc/Assets/PlayAward/Gfx/FBX/Bookshelve/BookShelve_M.FBX.meta
Merge remote-tracking branch 'origin/master'

Conflicts:
	PlayAwardSrc/Assets/PlayAward/Gfx/FBX/Bookshelve/BookShelve_M.FBX.meta
ADD: verja circular otra vez
FBX puerta principal
Marmoset shaderforge extension
Merge branch 'Merge_stahes'
Merge branch 'master' into develop
Concept looker
Merge branch 'develop' of https://github.com/exAntares/PlayAward into develop
ADD: ASSET ADD: verja terminada

Por ahora...