fixed calc function for person4
Merge branch 'master' of https://github.com/watty14/M2