ld fix
Merge branch 'master' of https://github.com/navff/madhouse

Conflicts:
	protocol/main.c