water collision completed, can burst through waterfall
Merge branch 'master' of https://github.com/delorenzo/Rebirth