Initial commit
Merge branch 'master' of github.com:sv63rus/testrepo

Conflicts:
	.gitignore