codecombat/codecombat — pull request #1982 by ericshentw (2014-12-23 07:05:53+00:00)
Title: Merge pull request #2 from codecombat/master

pull request#2 to sync from original repo
20141223