Error check for excel file
Edit FilterSet for supported formats
Merge remote-tracking branch 'upstream/master'
Changes to GUI and database
Merge pull request #26 from nelswad90/master

Changes to GUI and database