ok
okMerge branch 'master' of github.com:webvalley2013/imageanalisys

Conflicts:
	main2d.py