Added filling bottles from water barrel.
Merge pull request #331 from Kittychanley/waterBottle

Added filling bottles from water barrel.