Animation Teaks
Merge branch 'master' into gh-pages
Merge pull request #1 from zethussuen/gh-pages

I think I'm doing it right