hi
hi
Merge branch 'master' of github.com:telgniw/430-Git-Task2

Conflicts:
	github/3.txt
Merge branch 'master' of github.com:telgniw/430-Git-Task2
hi
Merge branch 'master' of github.com:telgniw/430-Git-Task2