even more stuff
Merge branch '2013' of github.com:bakerjonas/python-tutorials into 2013
Resolving conflict.
Conflicts:
	TextParsing/textparsing.rst