little changes
Merge branch 'tp_feature' of https://github.com/giacomovecere/tp-traceroute into tp_feature

Conflicts:
	ip_trial/ipClass.cpp
	ip_trial/ipClass.o
	ip_trial/ipManager.o
	ip_trial/iptrial
	ip_trial/udpRawManager.o
Merge branch 'tp_feature' of https://github.com/giacomovecere/tp-traceroute into tp_feature
makefile updated
Conflicts:
	ip_trial/ipClass.o
	ip_trial/iptrial
	ip_trial/udpRawClass.o
	ip_trial/udpRawManager.cpp
	ip_trial/udpRawManager.o