MP Assistance HW 1: Django Familiarization + Forms
Merge branch 'master' into enjotrial

Conflicts:
	VillanoOblena165mp/__init__.pyc
	VillanoOblena165mp/settings.pyc
	VillanoOblena165mp/urls.pyc
	VillanoOblena165mp/wsgi.pyc