finished
Merge branch 'master' of github.com:padilha/genetic_algorithm

Conflicts:
	headers/genetic_algorithm.h
	src/genetic_algorithm.c
correcting files