uppdate
Merge branch 'master' of github.com:parer800/helloGitWorld

Conflicts:
	README.md
merge