Bucket Swapping works
PlayerSprite started
Merge fixed
Merge branch 'master' of https://github.com/D4rkFr4g/CS134_Homework3