Modified package.json
Merge branch 'master' of github.com:iamezell/barber-pole

Conflicts:
	package.json
Merge pull request #4 from benltomlinson/master

Modified package.json