Merge branch 'master' of github.com:acaetano/getipaddress

Conflicts:
	.gitignore
	README.md

Signed-off-by: Ailton Caetano <ailtoncaetanos@gmail.com>