Now loading jquery via https (to prevent browsers complaining)
Merge branch 'master' of github.com:tleonardi/rmd2html

Conflicts:
	report/cover.md
	report/report.html
	report/report.md
	report/script1-fig/fig1.pdf
	report/script1-fig/fig1.png
	report/script1.md
	report/script2-fig/fig2.pdf
	report/script2-fig/fig2.png
	report/script2.md
	template.htm