main.jsp Style.css
Simple-handler todo and package definition
Simple-persistence added getAll method
todo: commit for new branches
Branch test
simple-handler WebHandler con busqueda por pagina de una variable
predefinida
WebHandler
remove todo
Modificada capa persistencia y otras yerbas, despues miramos los merge
necesarios.
simple-handler finish: TODO a few things
Simple-persistence change in the startdatabase
gitignore from the web
gitignoretest
primera prueba de las excepciones hasta arriba
Cosa rara, preguntar a lo pibes
Simple-persistence added '' for the fields and changed the = for LIKE
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