test
Merge branch 'master' of https://github.com/punksux/sprinklers

Conflicts:
	test.py

test
test