Merge pull request #48 from TAMED/staging

Saving Times
Merge pull request #49 from TAMED/staging

timer bar
forest11tmx
bat animation
steam geysers
added bot/top geyser markers to salmontile
Merge branch 'staging' of github.com:TAMED/seasons into staging
salmontile
added ent/bat
Merge branch 'master' into staging