Merge branch 'master' of
https://github.com/erickespinoza33/sisBibliotecarioApp.git

Conflicts:
	app/views/main.html

Change-Id: I5c1b8694f0c50940f57caac690c687a336f387eb
Signed-off-by: erickespinoza33 <erickespinoza27@gmail.com>
-parte de prestamo