First commit of mycpu for project 2
"Second commit attempt"
Merge remote branch 'origin/master'

Conflicts:
	transcript
	work/_info