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

# By ulus (2) and nwili (1)
# Via nwili
* 'master' of github.com:zoechip/Project-Info-Spreading:
  puh..
  Constraint
  Additions

Conflicts:
	doc/latex/infospreading.blg
	doc/latex/infospreading.log
	doc/latex/infospreading.pdf
	doc/latex/infospreading.synctex.gz