new stuff in code
Merge branch 'master' of https://github.com/carow/Meta-Analysis

Conflicts:
	Data/combined R script.R