updates
added 4th camera
finished 4-band merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	merge.py