Refactored animation and removed some comments
Merge remote-tracking branch 'origin/master'
Trying to remove phantom files