gitignore
Merge branch 'master' of github.com:gallamovs/igreetyou

Conflicts:
	.gitignore