Fix one last merge issue, basic RegisterAllocation works in testing (not yet used in codegen)
Fix one last merge issue, basic RegisterAllocation works in testing (not yet used in codegen)

kiorpesc/CS1622-Project3,kiorpesc/CS1622-Project3