Refactoring for GUI

* Removed main from Entry Point.  Should now make a new instance and then run startPounding with correct params.

* Made DatabasePounder take a tableQuery instead of a tableQueryFile
Made Gui work with EntryPoint
Fixed merge conflicts
Fixed more merge conflicts