fixed bug where you could trigger ending before end
Merge branch 'master' of https://github.com/ludimation/Winter