Add point calc functionality
Fix merge conflicts
Merge pull request #5 from chenhoward/points-calc

Points calc