Makefile
Merge branch 'master' of github.com:mattam82/groupoid

Conflicts:
	theories/groupoid_interpretation.v