Merge remote branch 'josh/master'
Merge branch 'master' of github.com:emilydolson/ChangingEnvironmentGA
continuing unittests for main
modifications for eunning on hpcc
fixing merge stuff
Merge branch 'master' of https://github.com/emilydolson/ChangingEnvironmentGA

Conflicts:
	data_handling.py
Merge branch 'master' of github.com:rileyannis/ChangingEnvironmentGA
Merge branch 'master' of github.com:nahumj/ChangingEnvironmentGA
Added Rana function
resyncing to try to fix bizarre hpcc bug
Adding RTR
syncing with hpcc
Merge branch 'master' of github.com:emilydolson/ChangingEnvironmentGA

Conflicts:
	vector_config.ini
Added schafferF7 and deceptive fitness functions
fixed deceptive function
Fixed with Schaffer specification
Sending updating qsub to Josh