cambios a la BD
Merge remote-tracking branch 'origin/sapu'
Create README.md
Reordenamiento y encuadramiento
Merge remote-tracking branch 'origin/rama's-rama'
Se aceptaron todos los cambios
Revert "Reordenamiento y encuadramiento"

This reverts commit e120f51feae4050d80981f933aca5a1926c9149a.
Revert "Revert "Reordenamiento y encuadramiento""

This reverts commit 45932bad6d907011bdbb4040feac8dc8c3976137.
Merge branch 'rama's-rama'
ordenamiento y cuadramiento
Vocations configured.
Bullets added.
</vocations> added at end of file :P.
pistol script.
rm changes
pistol and bullets added.
db
space
...
Merge remote-tracking branch 'origin/sapu'

Conflicts:
	data/items/items.xml
	data/lib/000-constant.lua
	data/weapons/weapons.xml
	forgottenserver.s3db