Merge branch 'master' of https://github.com/mastershin/sperm_genetic_algorithm

Conflicts:
	README.md
	index.html
local commit
local commit 2