dmschulman - created calculator
Merge branch 'master' of raspberrypi.local:~/webDesign