add two lines
change lines
Merge branch 'develop_123' into merge_dev

* develop_123:
  add two lines

Conflicts:
	sift.py