Fixed a bug with the deltas library identifying conflicts between patches.
Merge branch 'master' of https://github.com/codecombat/codecombat