Calculator Version

First version of my calculator branch