updated calc3.y and calc3a.c
Merge branch 'master' of https://github.com/sethicis/cs441project2JA

Conflicts:
	calc3.y
	calc3a.c