edit
Merge branch 'master' of https://github.com/jamesjwood/getWatchers

Conflicts:
	index.js
	package.json