add
Merge branch 'master' of https://github.com/Idony/CILkulator

Conflicts:
	Calc/Calc/Form1.cs