config
Merge branch 'master' of github.com:andreypz/nwu-my-analysis

Conflicts:
	zgamma/config.cfg
test
Merge branch 'master' of github.com:andreypz/nwu-my-analysis

Conflicts:
	zgamma/config.cfg
limit script improved