CVCV
Merge branch 'master' of https://github.com/bookmu/NitirkGitTest

Conflicts:
	.project
	.pydevproject

s