not quite there yet
Merge branch 'master' of https://github.com/spencerparkin/Calculator