distance to trash palceholder
Merge branch 'master' of https://github.com/woltage/codecamp14-whitetrash

Conflicts:
	views/map.jade
merge fix
Merge branch 'master' of https://github.com/woltage/codecamp14-whitetrash