Completed Person1 calc() method
Merge branch 'master' of https://github.com/ecahill/repository into original