Auto changes
Auto changes
Merge branch 'master' of https://github.com/Glitter-Gnomen/MultiCalc

Conflicts:
	MultiCalc/MultiCalc/bin/Debug/MultiCalc.exe
	MultiCalc/MultiCalc/obj/x86/Debug/MultiCalc.exe