Edit p0f
Merge branch 'master' of https://github.com/zam89/maduu

Conflicts:
	init/kippo