Updated for knitr changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	PA1_template.md