possible fix for pstcode.  Problem with test-begin
Merge branch 'master' of https://github.com/sethicis/cs441project2JA

Conflicts:
	calc3.y
conflicts resolved