Merge pull request #1 from rootcoma/tuna

Tuna
Merge remote-tracking branch 'upstream/testing'
Moving skips to inside of game
Merge pull request #162 from rootcoma/skip

Moving skips to inside of game