more stuff
Merge branch 'master' of github.com:michaeltingley/CS175
with scaling correctly on x dim