Test
To complete a merge
Merge pull request #1 from UniMath/master

Update
Merge pull request #2 from UniMath/master

capitalize Coq
Merge pull request #4 from UniMath/master

Update
Merge pull request #5 from UniMath/master

Update
New work from old Bsystems directory added
Merge pull request #20 from vladimirias/master

Updated bsystems.v
Merge pull request #6 from UniMath/master

Merge pull request #20 from vladimirias/master
Work added
Merging
Merge pull request #21 from vladimirias/master

More changes to bsystems.v
Merge branch 'master' of github.com:UniMath/UniMath

Conflicts:
	sub/coq