Buncha stuff
Merge branch 'master' of https://github.com/NGoldfarb/Calculator.git

Conflicts:
	Calculator/main.cpp