Wrapping lines at 100 chars
Merge remote-tracking branch 'origin/master'

Conflicts:
	theories/README.md