First commit
Merge https://github.com/Matt-Herbstritt/calculator