Updated spritesheets and made a couple of minor changes
Merge remote-tracking branch 'origin/master'