...
Merge branch 'master' of https://github.com/egorufimtsev/tex_and_rstudio

Conflicts:
	bibtex-blx.bib
	bibtex-concordance.tex
	bibtex.log
	bibtex.pdf
	bibtex.run.xml
	bibtex.synctex.gz
	bibtex.tex