gitignore
Merge branch 'master' of github.com:SrX/urjcW4x4R-Pi

Conflicts:
	variables/__init__.pyc