Added a new option -a to generate detailed information about the name
resolution process.
Merge branch 'master' of github.com:vbajpai/happy

Conflicts:
	README.md
	happy.c