ok
Merge branch 'master' of https://github.com/muuankarski/kaRski

Conflicts:
	R/knitpandoc_pdf.R