fixing merge stuff
Merge branch 'master' of https://github.com/emilydolson/ChangingEnvironmentGA

Conflicts:
	data_handling.py