hee max
Merge remote-tracking branch 'origin/master'

Conflicts:
	assignment 3/Genetic_algorithm_build_1.m