Initial commit
Merge /home/descent/git/calc