Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	DisenoDeSistemas/src/dao/AnuncioDAO.java
	DisenoDeSistemas/src/dao/IAnuncioDAO.java
	DisenoDeSistemas/src/utility/Test.java
Merge origin/master

Conflicts:
	DisenoDeSistemas/src/dao/AnuncioDAO.java
	DisenoDeSistemas/src/dao/IAnuncioDAO.java
	DisenoDeSistemas/src/utility/Test.java
Merge origin/master

Conflicts:
	DisenoDeSistemas/src/dao/AnuncioDAO.java
	DisenoDeSistemas/src/utility/Test.java
Merge origin/master

Conflicts:
	DisenoDeSistemas/src/dao/AnuncioDAO.java
	DisenoDeSistemas/src/utility/Test.java
23
Merge origin/master

Conflicts:
	DisenoDeSistemas/src/dao/AnuncioDAO.java
	DisenoDeSistemas/src/dao/IAnuncioDAO.java
	DisenoDeSistemas/src/utility/Test.java
Emepezamos con el alta anuncio wachin