the city sort of randomly drops stuff at the edge
Merge branch 'master' of https://github.com/BrettMcNeff/SamiandtheProgrammers

Conflicts:
	game/src/app.js