background, eval and discussion and conclusion
Merge branch 'master' of github.com:ckruczek/db-science-project

Conflicts:
	paper/conclusion.tex
	paper/discussion.tex