my gitignore
Merge branch 'master' of github.com:DennisAleynikov/unilingo

Conflicts:
	.gitignore