Deleted extraeneous line
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tests.py