Fix makefile
Merge branch 'v0.7' of github.com:noxiouz/Combaine into v0.7

Conflicts:
	aggregation/aggregation.go