Before Merge
Merge branch 'master' of https://github.com/dtapping/hc-waste-walk

Conflicts:
	www/js/app.js