Initial calculator choices
Merge branch 'master' of https://github.com/mrgeorgegray/calkit