a function added that scales the training and test data
merged stuff yo