merging plzzzz
removing the merge errors

^^
adding the player art, and the background art

some art
kaas