begin locu test
Merge branch 'master' of github.com:emoore24/shopify

Conflicts:
	server.js
	views/test.handlebars