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

Conflicts:
	.gitignore
	.project
	.pydevproject
Merge branch 'master' of https://github.com/jackiiz/GitTest
update