Added player sprite and walking
Fixed merge issue