plantilla buscar libro
Merge branch 'master' of https://github.com/Qaysen/Combook

Conflicts:
	COMBOOK/__init__.pyc
	COMBOOK/settings.pyc
	COMBOOK/urls.pyc
	COMBOOK/wsgi.pyc
	app/__init__.pyc
	app/admin.pyc
	app/forms.pyc
	app/models.pyc
	app/views.py
	app/views.pyc