rename some functions; pretty much nothing else.
xMerge branch 'master' of github.com:team461WBI/scoutify-hub