xx
Merge branch 'func2'
added cout
Merge branch 'master' into rich

Conflicts:
	project2/new.rc
	project2/rc.s