2017

How to avoid Github/merge conflicts with Rmd-files 2017-03-06