match merging
Merge branch 'master' of github.com:team461WBI/scoutify-hub
sorting... all we have left is displaying and writing to filels