Gitignore not ignoring resources
Animation Improvements
Endless animation fix
Fixing conflicts