hhh
fff

Merge branch 'gh-pages'

Conflicts:
	index.Rmd
	index.html
	index.md