Commit before update
Merge branch 'master' of https://github.com/naodell/Analysis_CMS

Conflicts:
	fcncAnalysis/fcncAnalyzer.C
Away for the weekend!