Hopefully a good place to be
Looks good, looks good
Added jpg capture capability
Merge branch '157c'

Conflicts:
	multidroplet.py