Fixed a couple of the bugs with marks.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/codecombat/codecombat