Fixing..
Merge branch 'master' of github.com:lemire/Code-used-on-Daniel-Lemire-s-blog

Conflicts:
	extra/benchmem.cpp