Init
Merge branch 'master' of github.com:igoral5/hello

Conflicts:
	.gitignore