Roger modified
Roger merged
Merge branch 'master' of https://github.com/rlevy/pragmatic_disjunction

Conflicts:
	pypragmods/examples.py