commit so i can pull
Fixed merge conflicts
fixing merge conflicts
small change
formset to form, changed to base template, made dropbown
formset to form, changed to base template, made dropbown
removed virtualenv stuff
Merge pull request #23 from calblueprint/review_modelform

Review modelform