Merge pull request #5 from megacyber/master

as
lab2
Merge pull request #6 from megacyber/master

asd
Merge branch 'master' of https://github.com/jackiiz/GitTest

Conflicts:
	.gitignore
	.project
	.pydevproject
Merge branch 'master' of https://github.com/jackiiz/GitTest
update
Merge pull request #4 from jackiiz/master

sss