git commit
git commit
Merge branch 'copy'

Conflicts:
	pagegood.c