New project
Merge branch 'master' of https://github.com/VladAbramov/labs

Conflicts:
	.gitignore