updated code with all optionsg
Merge branch 'master' of https://github.com/nhanvtran/ProjectPUPPI

Conflicts:
	ana_cms_v2/puppiSimpleAnalyzer.cpp
updated puppig