finished dog animation
merging platform
fixed merge conflict
ledges working