changed
Merge branch 'master' into gh-pages

Conflicts:
	_site/atom.xml