ok'
Merge branch 'master' of github.com:log2av/pythoncode

Conflicts:
	README
without modification