It works, it's beautiful!!
Merge branch 'master' of https://github.com/bhc24/EECS_393_Project

Conflicts:
	pamlla/forms.py
Fuck Django