Fixes #546
Merge branch 'master' of https://github.com/walkingtospace/codecombat