resolving merge
Merge branch 'master' of github.com:GeStanley/assignment4
calculation functions finished. still missing scale