Replaced player animation with our own
Merge branch 'testing'