add file
add gitignore
Merge branch 'master' of https://github.com/yannisdw/Hello-World

Conflicts:
	.gitignore
	yannisdw.txt