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

Conflicts:
	sprinkler.py

test