paper.tex actualizado
Merge remote-tracking branch 'origin/old-db'

Conflicts:
	paper/paper.tex
tables
Merge branch 'master' of github.com:geekazoid/leninanalysis

Conflicts:
	paper/paper.tex