Trying to get session code merging to work again.
Added a screen for when playback ends.
Merge branch 'master' of https://github.com/codecombat/codecombat
Fixed simulator

The format of something must have suddenly changed?