preparation for new flat ntuples
resolving conflicts
resolving conflicts
resolving conflicts
Merge pull request #33 from dimatteo/dev-XlJets

preparation for new flat ntuples