Added signal handling
Merge branch 'master' of github.com:CodaP/p3

Conflicts:
	calc.c