Functional now
Merge branch 'master' of https://github.com/carlpoole/x86-Calculator