render after pull and fix conflict
Merge branch 'gh-pages' of https://github.com/ateucher/rcourse_site into gh-pages