Basic animation from sprite sheet
Merge remote-tracking branch 'origin/master'
Fix some merge issues