I'm not sure.
Merge branch 'master' of https://github.com/zoccihedron/Calculator

Conflicts:
	Calculator/Form1.cs