Calculator parser
Merge pull request #2 from mmath10/master

Update