re-enabled camera
Merge branch 'master' of github.com:shrx/RaspberryPi

Conflicts:
	cronskripte/temp.sh