modified:   day1/slides01.pdf
	new file:   day2/code/norm.R
	new file:   day2/code/uniform.R
	new file:   day2/knitr.tex
	new file:   day2/slides02.pdf
	new file:   day2/slides02.tex
	new file:   day2/watermark.tex
Merge branch 'master' of https://github.com/thirdwing/RcppTraining

Conflicts:
	day1/slides01.pdf

	modified:   day1/slides01.tex
	deleted:    day2/code/.Rhistory
	deleted:    day1/slides01.pdf