Evolution implementation without conflict

Pawel Sznajderrequested to merge
evolution_implementation_without_conflict into master

#19

Edited by Nabil Chouika

Merge request reports