brucetoddlee/good_or_evil — pull request #23 by jongmini (2014-02-25 17:22:36+00:00)
Title: calvin's changes merged to my master

calvin's changes merged to my master