testss
Merge branch 'master' of https://github.com/bookmu/asdfghjkl

Conflicts:
	.project
	.pydevproject
t
Merge pull request #1 from nitirk/master

dfdgafytyhfffffffff
Merge pull request #2 from brawbraw/master

lab2
BookEdit
Merge pull request #2 from bookmu/master

dgg