added 11
Merge remote-tracking branch 'origin/master' into Eleven

Conflicts:
	Sample.txt