James edited something
Merge branch 'test' of https://github.com/agnwinds/python into test

Nick did something and so did James. Nick's was was better so James fixed conflict to go with Nick's way.

Conflicts:
	README.md