d
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	_site/12-09-2014.Rmd
	_site/12-09-2014.html
	_site/19-09-2014.Rmd
	_site/gh-pages-setup.html
	_site/index.html
	_site/produceReports.R
	_site/tips-and-tricks.html
	_site/toolbox-install.html