beginnings of animation stuff
merge conflict using cole's storyboard
Merge branch 'master' of github.com:cole-herrmann/OrcaCare
merging with all of my stuff after the big rename