Merge Operation
Merge branch 'master' of https://github.com/rdspring1/cs380c_scalar_optimization_a3

Conflicts:
	hw3/compiler.jar