fix bugs
Merge branch 'master' of https://github.com/ami-GS/Timelapse_RPi

Conflicts:
	cameraset.py