a
Merge branch 'working' of https://github.com/cougarTech2228/scoutingApp into working
fixed some problems with joes code
added some small things
the program works now
-yay-