primer commit en maq virtual
Merge branch 'master' of https://github.com/jsuela/pfcjsuela

Conflicts:
	mypfcproject/urls.pyc
	mypfcproject/urls.py~
	pfcapp/models.pyc
	pfcapp/views.py
	pfcapp/views.pyc
	pfcapp/views.py~