added many animations
Merge pull request #14 from jeffChavez/jeff

added many animations
fix conflict