f
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.rst
	language/ruby.rst
	web.rst