Merge branch 'origin/master'
Changes to HEAD~3
Merge branch 'env-desc'

Conflicts:
	config/environment.py
	neat-program.py