Update to fix git accident
Merge branch 'master' of github.com:danprince/juggler

Conflicts:
	README.md
	package.json