temp commit
Merge branch 'chizi' into apelsin
Consolidating sprites and animations