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

Conflicts:
	project2/rc.s