merge will be needed
Merge branch 'master' of github.com:pigworker/MetaprogAgda

Conflicts:
	Vec.lagda