deleted:    EscapeCommentInC.py
	deleted:    FLVParser.py
	deleted:    Scrapy.py
	modified:   SoupTest.py
	deleted:    byteArrayTest.py
Merge branch 'master' of github.com:modeyang/py_workspace

Conflicts:
	FLVParser.py
	main.py

	new file:   FLVParser.py
	new file:   Scrapy_sgmllib.py
	modified:   Server.py
	new file:   attribute.py
	new file:   dec2hex.py
	new file:   main.py
	modified:   oddtest.py
	modified:   urlPattern.py