Permit non-endo monoidal functors
Merge branch 'master' of github.com:ekmett/categories

Conflicts:
	wip/Pro.hs