fix camera FPS
Merge branch 'master' of https://github.com/jrpharis/autoPi_Hardware

Conflicts:
added motion registation
Merge branch 'master' of https://github.com/jrpharis/autoPi_Hardware

Conflicts:
	alarm.py
	main.py