Added in scales that look good
Merge branch 'master' of github.com:acheson/cs171pj2