More Buttons Ben Adenbaum
Merge branch 'master' of https://github.com/zoccihedron/Calculator

Conflicts:
	Calculator/bin/Debug/Calculator.exe
	Calculator/bin/Debug/Calculator.pdb
	Calculator/obj/x86/Debug/Calculator.csproj.FileListAbsolute.txt
	Calculator/obj/x86/Debug/Calculator.csproj.GenerateResource.Cache
	Calculator/obj/x86/Debug/Calculator.exe
	Calculator/obj/x86/Debug/Calculator.pdb
	Calculator/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	Calculator/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache