init
Merge branch 'master' of github.com:voltazor/watch

Conflicts:
	.gitignore