1. add to merge
Merge branch 'master' of https://github.com/hankes-garden/mycode.git

Conflicts:
	python_lab/results/cell_loc_filled.txt
Merge branch 'master' of https://github.com/hankes-garden/mycode.git
1. merge