change in pear
Merge branch 'master' of https://github.com/schatten80/my-git-repo

Conflicts:
	green.html