.
Merge branch 'master' of github.com:toymachiner62/calc
Working on stuff