merging
Merge branch 'master' of https://github.com/gaylel/intrahosts-network

Conflicts:
	params/opt.params
updated Makefile