Merge branch 'master' of github.com:charliebone/shopifyr

Conflicts:
	README.md
Merge branch 'master' of github.com:charliebone/shopifyr