bugfixes
Merge branch 'master' of https://github.com/vellamike/optimizer

Conflicts:
	optimizer/fitnessFunctions.py
fix