gitingore

gitingnore
Merge branch 'master' of https://github.com/nortrix/cursovik

Conflicts:
	.gitignore