merge
loading on new trip
Merge branch 'master' of https://github.com/coder-js/Shopping-Buddies-trial

Conflicts:
	www/js/controllers.js