working on c_out and local vars
x
Merge branch 'master' into temp2

Conflicts:
	project2/rc.s
x
Merge branch 'temp2'

Conflicts:
	project2/src/parser.java
	project2/src/sym.java
x
final
Merge branch 'DONT-TOUCH' into rich

Conflicts:
	project2/src/parser.java
	project2/src/sym.java