Committing changes hayyyyy
Merge branch 'master' of github.com:b-adams/CS345Sp13-Calculators