Merge branch 'master' of https://github.com/msandrock/buddyshopping

Conflicts:
	routes/buddy-shopping.js
Merge branch 'master' of https://github.com/msandrock/buddyshopping