tried some more
Merge branch 'master' of https://github.com/carow/Meta-Analysis.git
deleted
Merge branch 'master' of https://github.com/carow/Meta-Analysis.git

Conflicts:
	R scripts/sweave_document-forest.re.pdf
	R scripts/sweave_document.Rnw
	R scripts/sweave_document.tex