android properties
Merge branch 'master' of https://github.com/gsubram4/chansey
re-enabled marine life animations, included seaBox and star in dude-lean atlas