added forms.py
merged conflicts