First initial
rm test.txt
test2
Merge branch 'master' of github.com:olegsobchuk/app_new

Conflicts:
	.gitignore