kenji
Merge branch 'master' of https://github.com/kenjimyzk/knitr-template

Conflicts:
	kenji.lyx