Fixed build
Merge branch 'master' of https://github.com/cdc67/Quipper

Conflicts:
	makefile