ok trying again
merging

Merge branch 'master' of github.com:SquareBracketAssociates/PharoForTheEnterprise-english

Conflicts:
	PFTE.tex