creacion de css y admin.jsp
admin.jsp
algo
main.jsp
cambios
main y admin pages
admin, createuser, main creadas
Simple-persistence added '' for the fields and changed the = for LIKE
Merge remote-tracking branch 'origin/joaquin' into Artiom

Conflicts:
	simple-handler/.project
	simple-handler/pom.xml
	simple-webapp/src/main/webapp/NewFile.html
	simple-webapp/src/main/webapp/WEB-INF/web.xml
	simple-webapp/src/main/webapp/css/Style.css
	simple-webapp/src/main/webapp/main.jsp
Merge branch 'joaquin' into Artiom

Conflicts:
	simple-webapp/src/main/webapp/WEB-INF/web.xml
commit para el checkout
last commit from joaquin. Web app
Prueba con el servlet login
Web files
last commit
simple-webapp
modify-user
webhandler and loginservlet changes in user exceptions and logic, not
finished yet.
join for the users
Falta acomodar el error de traer infinitas tablas, es un problema
logico, antes del domingo terminar