-added walking npcs to merged scene
-added water bottle
-tweaked some textures.