Edits on sky stages
Merge branch 'master' of https://github.com/foolmoron/ggj14