???
Merge branch 'master' of https://github.com/mattjorgs/scouting-scripts

Conflicts:
	functions/functions.php