cns
Merge branch 'master' of https://github.com/alexeyche/alexeyche-junk

Conflicts:
	cns/doc/my_papers/review.log
	cns/doc/my_papers/review.pdf
	cns/doc/my_papers/review.synctex.gz