Merge pull request #2 from codecombat/master

pull request#2 to sync from original repo
20141223