Merge pull request #9 from echen027/master

Added flask form
Merge remote-tracking branch 'upstream/master'

Merging with Leon