Adding
Merge branch 'master' of https://github.com/diegovbarros/HelloWorld

Conflicts:
	.gitignore