updated player to change sprite when moving
drawing
merged
fixed merge conflicts
undid some changes
merged