added man
Merge branch 'master' of github.com:GoatHunter/HelloWorld

Conflicts:
	doc.txt