Merge remote-tracking branch 'origin/gh-pages' i

Conflicts:
	index.Rmd