added calc
Merge branch 'master' of github.com:abaker/dotfiles