no message
update
Merge branch 'master' of github.com:zoechip/Project-Info-Spreading

# By ulus (6) and nwili (3)
# Via ulus
* 'master' of github.com:zoechip/Project-Info-Spreading:
  update
  1-local-max.png
  update
  update
  agent based evolution 2 peaks
  some new chapters
  ...
  AnalysisPforget2
  AnalysisPforget

Conflicts:
	doc/latex/infospreading.aux
	doc/latex/infospreading.log
	doc/latex/infospreading.pdf
	doc/latex/infospreading.synctex.gz
	doc/latex/infospreading.toc
	doc/latex/results.tex
Merge branch 'master' of github.com:zoechip/Project-Info-Spreading

# By nwili
# Via nwili
* 'master' of github.com:zoechip/Project-Info-Spreading:
  update

Conflicts:
	doc/latex/infospreading.aux
	doc/latex/infospreading.log
	doc/latex/infospreading.pdf
	doc/latex/infospreading.synctex.gz
	doc/latex/infospreading.toc
	doc/latex/results.tex
Merge branch 'master' of github.com:zoechip/Project-Info-Spreading

# By nwili
# Via nwili
* 'master' of github.com:zoechip/Project-Info-Spreading:
  update

Conflicts:
	doc/latex/infospreading.aux
	doc/latex/infospreading.log
	doc/latex/infospreading.pdf
	doc/latex/infospreading.synctex.gz
	doc/latex/infospreading.toc
	doc/latex/results.tex