config files
Merge branch 'master' of github.com:peruzzim/UserCode

Conflicts:
	diphoton/template_studies_2d_variablebinning.C