update rCharts
resolve conflicts

Merge branch 'master' of https://github.com/benmarwick/CSSS-Primer-Reproducible-Research

Conflicts:
	CSSS_WI14_Reproducibility-figure/nvd3plot1.html
	CSSS_WI14_Reproducibility-figure/nvd3plot2.html
	CSSS_WI14_Reproducibility.html
	CSSS_WI14_Reproducibility.md