Merge branch 'working' into joe_working
GUI work
Merging files
removed redundant files
Merge pull request #29 from cougarTech2228/joe_working

Joe working