some edits
Merge branch 'master' of https://github.com/cathywu/traffic-estimation

Conflicts:
	SPG.m
	computeHist.m
	lbfgs2.m