merge
Merge branch 'master' of https://github.com/juliaducey/Heat-Wave
groundwork for water stations and umbrellas
Merge branch 'master' of https://github.com/juliaducey/Heat-Wave
added water button to scene