Changes to be committed:
	new file:   entregable/Img1-admin.png
	new file:   entregable/Img1-usr.png
	new file:   entregable/Img2-admin.png
	new file:   entregable/Img3-admin.png
	new file:   entregable/Img4-admin.png
	new file:   entregable/Img5-admin.png
	new file:   entregable/Manual_d-usuari.odt
	modified:   templates/Logged_Functions/facturar.php
	modified:   templates/Logged_Functions/filter_facturar.php
	modified:   templates/Logged_Functions/processar_filtre_factura.php
	modified:   templates/Logged_Functions/processar_lusrs.php
	modified:   templates/processar_list.php
 Changes to be committed:
	new file:   data/uploads/10471347_10204552808569012_6243237479709651089_n.jpg
	new file:   data/uploads/Homer_9.jpg
	new file:   data/uploads/Img1-admin.png
	new file:   data/uploads/Img4-admin.png
	new file:   data/uploads/drizzt_do_urden2.jpg
 Changes to be committed:
	new file:   data/uploads/.gitignore
Merge branch 'master' of https://github.com/PereBal/BD_II into PereBal
Merge branch 'PereBal'
 Changes to be committed:
	modified:   templates/processar_list.php
Merge branch 'master' of https://github.com/PereBal/BD_II