Update test.py
Second Commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	test.py