add n-1 for photon analyser and make so that folder is DiLepton so easier to read in plotting tools
fix a few conflicts
Merge pull request #23 from phy6phs/test

changes to TTbarPhotonAnalyser