Change README.md
Merge branch 'master' of https://github.com/vashstorm/miscellaneous

Conflicts:
	.gitignore

	modified:   .gitignore
	modified:   c/format_cfg/test.cfg
	modified:   c/format_cfg/tt.cfg
	modified:   python/basetype/1.py
	modified:   python/basetype/2.py
	modified:   python/basetype/3.py
	modified:   python/basetype/4.py
	modified:   python/basetype/5.py
	modified:   python/basetype/d.txt
	modified:   python/basetype/pr.py
	modified:   python/class/person.py
	modified:   python/control/iter.py
	modified:   python/control/while1.py
	modified:   python/control/while2.py
	modified:   python/control/while3.py
	modified:   python/control/while4.py
	modified:   python/except/1.py
	modified:   python/file/1.py
	modified:   python/function/1.py
	modified:   python/function/2.py
	modified:   python/function/3.py
	modified:   python/http/1.py
	modified:   python/inout/1.py
	modified:   python/inout/2.py
	modified:   python/inout/3.py
	modified:   python/inout/4.py
	modified:   python/inout/5.py
	modified:   python/inout/back.txt
	modified:   python/inout/d.txt
	modified:   python/module/1.py
	modified:   python/module/bb.py
	modified:   python/regularEx/1.py
	modified:   python/samples/1.py
	modified:   python/samples/2.py
	modified:   python/samples/3.py
	modified:   python/samples/4.py
	modified:   python/samples/5.py
	modified:   python/socket/client.py
	modified:   python/socket/server.py
	modified:   python/urllib/1.py
	modified:   python/xml/1.py
	modified:   python/xml/2.py
	modified:   python/xml/3.py
	modified:   python/xml/4.py
	modified:   socket/socket_1/mclient.cpp
	modified:   socket/socket_1/test.sh