Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'origin' into working
Merge branches 'master' and 'drewswork' into working
Merge pull request #43 from cougarTech2228/master

Merge pull request #42 from cougarTech2228/working
added spyder project file to gitignore
testing cmd
worked on fixing bugs in user
Merge branch 'working' of https://github.com/cougarTech2228/scoutingApp into working
Merge branch 'master' of https://github.com/cougarTech2228/scoutingApp into working
fixed statelist
Merge branch 'working' of https://github.com/cougarTech2228/scoutingApp into working
asdfghjkl;
Merge branch 'working' of https://github.com/cougarTech2228/scoutingApp into working
s
some changes
ran into threading issues
created a work around
multithreading and misleading loading sequence
good news and bad news

good news: i figured out the problem
badd news: it still doesnt work
threading finally works
Merge pull request #44 from cougarTech2228/test

Test