working flask form with a lot of extra stuff
Merge remote-tracking branch 'upstream/master'

Merging with Leon
Merge pull request #10 from echen027/master

Fixed flask form, a lot of extra stuff that needs to be removed.