anim test
deleted unneeded animation code
animation changed
Merge branch 'animation-ex'