testing
test
Merge branch 'master' of https://github.com/DonaldMGray/Class_DataScienceToolbox

Conflicts:
	foo