Merge branch 'master' of https://github.com/cksystemsgroup/acdc

Conflicts:
	src/main.c
little cleanup
Merge branch 'scalloc-bench'

Conflicts:
	src/main.c