fixed stupid bug where mass was calculated incorrectly.
Merge branch 'master' of github.com:tdurk93/CS3451_P6