final calc
Merge branch 'master' of github.com:cgordo2/practice

;llkllkk;