20130216
Merge branch 'master' of github.com:windfromdesert/code

Conflicts:
	test.py
delete a file.