Continued work on scoop
Merge branch 'master' of https://github.com/sethicis/cs441project2JA

Conflicts:
	calc3.y
Fixed merge conflicts