operations in calc
Merge branch 'master' of https://github.com/CodaP/p3

Conflicts:
	calc.c