Updated animation system
Merge pull request #12 from nolanfilter/Nolan

Updated animation system