Animation work on weather
Fixes merge conflicts
Merge pull request #10 from ambertunnell/ben_branch

Ben branch