Added calculations
Merge branch 'master' of https://github.com/zaynashahzad24/CS158A