Titulos
Titulos
Merge origin/master

Conflicts:
	src/bd2/Authors.form
	src/bd2/Authors.java
	src/bd2/Discounts.form
	src/bd2/Discounts.java
	src/bd2/Employee.form
	src/bd2/Employee.java
	src/bd2/Jobs.form
	src/bd2/Jobs.java
	src/bd2/Publishers.form
	src/bd2/Publishers.java
	src/bd2/Stores.form
	src/bd2/Stores.java
	src/bd2/TitleAuthor.form
	src/bd2/TitleAuthor.java
	src/bd2/Titles.form
	src/bd2/Titles.java
Build de Revisión. Deal with it.