Using Datasource
Merge origin/master

Conflicts:
	web/index.html
	web/seleccionLibro.jsp