cambiado el paradigma de la base. ahora usamos fefa2000
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/control/dao/ProjectDAO.java
	src/main/java/servlets/project/AddProjectServlet.java
	src/main/java/servlets/user/RegisterServlet.java
	src/test/java/InitializeDB.java
	src/test/java/UserTest.java
cambiado el paradigma de la base. ahora usamos fefa2000