some text
Merge branch 'master' of https://github.com/imthedevil/PhotoBooth

Conflicts:
	scriptid/python_test.py

RPi commit