initial commit
initial commit
corrigiendo error
probar url
corregir url
url corregido
arreglado gitignore
Todo perfecto

Conflicts:
	.gitignore
	PDFy/PDFy/__init__.pyc
	PDFy/PDFy/settings.py
	PDFy/PDFy/settings.pyc
	PDFy/PDFy/urls.pyc
	PDFy/PDFy/wsgi.pyc
	PDFy/conversion/__init__.pyc
	PDFy/conversion/admin.pyc
	PDFy/conversion/migrations/__init__.pyc
	PDFy/conversion/models.pyc
	PDFy/conversion/views.py
	PDFy/conversion/views.pyc
	PDFy/db.sqlite3
Creando un contactanos