Anem lembro
Merge branch 'master' of https://github.com/kurka/plants-network

Conflicts:
	network.py
	rules_evolution.py
Merge branch 'master' of https://github.com/kurka/plants-network
fixed name
fixed name