more malloc
Merge branch 'master' of github.com:raoulmillais/linux-system-programming

Conflicts:
	Makefile