minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Celllife/v1/cell_life_v1_main.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	Celllife/v1/cell_life_v1_main.py