old
Merge branch 'master' of https://github.com/wkapga/rstuff

Conflicts:
	g/endo1.html
	g/figure/unnamed-chunk-21.png
	g/figure/unnamed-chunk-22.png
	g/figure/unnamed-chunk-23.png
	g/figure/unnamed-chunk-24.png
	g/figure/unnamed-chunk-25.png
	g/figure/unnamed-chunk-26.png
	g/figure/unnamed-chunk-27.png
	g/figure/unnamed-chunk-28.png
fix tcx

Signed-off-by: Gabriel Panzenböck <gabriel.panzenboeck@gmail.com>