asda

asda
ahora la torre guarda
asda
Merge branch 'cambios_03_12_2014'

Conflicts:
	DB/PokemonUsuarios/db.lck
	DB/PokemonUsuarios/log/log.ctrl
	DB/PokemonUsuarios/log/log1.dat
	DB/PokemonUsuarios/log/log2.dat
	DB/PokemonUsuarios/log/logmirror.ctrl
	DB/PokemonUsuarios/seg0/c10.dat
	DB/PokemonUsuarios/seg0/c150.dat
	DB/PokemonUsuarios/seg0/c230.dat
	DB/PokemonUsuarios/seg0/c241.dat
	DB/PokemonUsuarios/seg0/c251.dat
	DB/PokemonUsuarios/seg0/c90.dat
	DB/derby.log
	DB/pokemdb/db.lck
	DB/pokemdb/log/log.ctrl
	DB/pokemdb/log/logmirror.ctrl