added scaling
Merge branch 'master' of https://github.com/willwhitney/6.835-final-project