added function public ip to know the IP address that is facing the GLOBAL INTERNET
Correcting the diff configuration to use diff3 and not meld